bitkeeper revision 1.1108.52.1 (410eb854DZhEQqBAsiFdxS10QzU2Sg)

Avoid putting ip= on linux command line unless the user actually wants an address set or is using kernel dhcp.

diff --git a/tools/python/xen/xm/create.py b/tools/python/xen/xm/create.py
index e8d79573613ce9c0e023a10fa1f8d23ddf882187..286e1d34787c5abda6c057225c301231f74aa02b 100644 (file)
--- a/tools/python/xen/xm/create.py
+++ b/tools/python/xen/xm/create.py
@@ -354,18 +354,17 @@ def preprocess_vifs(opts, vals):
     vals.vif = vifs
 
 def preprocess_ip(opts, vals):
-    setip = (vals.hostname or vals.netmask
-             or vals.nfs_server
-             or vals.gateway or vals.dhcp or vals.interface)
-    if not setip: return
-    dummy_nfs_server = '1.2.3.4'
-    ip = (vals.ip
+    if vals.ip or vals.dhcp != 'off':
+        dummy_nfs_server = '1.2.3.4'
+        ip = (vals.ip
           + ':' + (vals.nfs_server or dummy_nfs_server)
           + ':' + vals.gateway
           + ':' + vals.netmask
           + ':' + vals.hostname
           + ':' + vals.interface
           + ':' + vals.dhcp)
+    else:
+        ip = ''
     vals.cmdline_ip = ip
 
 def preprocess_nfs(opts, vals):